Merge from mainline.
authorTassilo Horn <tassilo@member.fsf.org>
Mon, 28 Dec 2009 19:25:38 +0000 (20:25 +0100)
committerTassilo Horn <tassilo@member.fsf.org>
Mon, 28 Dec 2009 19:25:38 +0000 (20:25 +0100)
commit5be58863c710bb28b867db4b4f0df442b5fc2a43
tree0634ed973636a280c090f7e416e4f481735377de
parent35969beada4f4d170cbeb5c85fe68b139fb1e776
parent920d679cedbb623e4319586eefb31d0bb79461c0
Merge from mainline.